From: Matthias Clasen <mclasen@redhat.com>
Date: Sat, 11 Jun 2016 14:23:27 +0000 (-0400)
Subject: Use the portal when sandboxed
X-Git-Tag: archive/raspbian/3.24.39-1+rpi1~1^2~65^2~39^2~1506
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=6cf71ed6bba0dbb8d01e4c6d566ff1467cfa0b25;p=gtk%2B3.0.git

Use the portal when sandboxed

Use the sandbox helper api to find out whether to use
the file chooser portal.

https://bugzilla.gnome.org/show_bug.cgi?id=768499
---

diff --git a/gtk/gtkfilechoosernativeportal.c b/gtk/gtkfilechoosernativeportal.c
index 348c402bd7..8a52a47753 100644
--- a/gtk/gtkfilechoosernativeportal.c
+++ b/gtk/gtkfilechoosernativeportal.c
@@ -277,14 +277,7 @@ gtk_file_chooser_native_portal_show (GtkFileChooserNative *self)
   const char *signal_name;
   GDBusSignalCallback signal_callback;
 
-  if (g_getenv ("GTK_USE_PORTAL") == NULL)
-    return FALSE;
-
-  if (gtk_file_chooser_get_extra_widget (GTK_FILE_CHOOSER (self)) != NULL)
-    return FALSE;
-
-  update_preview_signal = g_signal_lookup ("update-preview", GTK_TYPE_FILE_CHOOSER);
-  if (g_signal_has_handler_pending (self, update_preview_signal, 0, TRUE))
+  if (!gtk_should_use_portal ())
     return FALSE;
 
   connection = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, NULL);